Add missing GDK_THREADS_ENTER/LEAVE.

2004-12-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserentry.c (check_completion_callback)
	(load_directory_callback): Add missing GDK_THREADS_ENTER/LEAVE.

	* gtk/gtkfilechooserdefault.c (edited_idle_cb)
	(shortcuts_drag_outside_idle_cb): Add missing
	GDK_THREADS_ENTER/LEAVE.  (#161604)

	* gtk/gtkfilechooserdefault.c (selection_check_foreach_cb):
	(list_select_func): Don't call gtk_file_info_get_is_folder()
	on NULL.

diff --git a/ChangeLog b/ChangeLog
index 652eb7e057dbb3565a2b39a632e5281be53cdd21..0cce19d02af23d3ea4fc996728748d4b5c1fb910 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2004-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserentry.c (check_completion_callback) 
+       (load_directory_callback): Add missing GDK_THREADS_ENTER/LEAVE.
+
+       * gtk/gtkfilechooserdefault.c (edited_idle_cb) 
+       (shortcuts_drag_outside_idle_cb): Add missing 
+       GDK_THREADS_ENTER/LEAVE.  (#161604)
+       
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): 
+       (list_select_func): Don't call gtk_file_info_get_is_folder()
+       on NULL. 
+
        * gtk/gtkaboutdialog.c (gtk_about_dialog_get_logo_icon_name): 
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 652eb7e057dbb3565a2b39a632e5281be53cdd21..0cce19d02af23d3ea4fc996728748d4b5c1fb910 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,16 @@
 2004-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserentry.c (check_completion_callback) 
+       (load_directory_callback): Add missing GDK_THREADS_ENTER/LEAVE.
+
+       * gtk/gtkfilechooserdefault.c (edited_idle_cb) 
+       (shortcuts_drag_outside_idle_cb): Add missing 
+       GDK_THREADS_ENTER/LEAVE.  (#161604)
+       
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): 
+       (list_select_func): Don't call gtk_file_info_get_is_folder()
+       on NULL. 
+
        * gtk/gtkaboutdialog.c (gtk_about_dialog_get_logo_icon_name): 
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 652eb7e057dbb3565a2b39a632e5281be53cdd21..0cce19d02af23d3ea4fc996728748d4b5c1fb910 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,16 @@
 2004-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserentry.c (check_completion_callback) 
+       (load_directory_callback): Add missing GDK_THREADS_ENTER/LEAVE.
+
+       * gtk/gtkfilechooserdefault.c (edited_idle_cb) 
+       (shortcuts_drag_outside_idle_cb): Add missing 
+       GDK_THREADS_ENTER/LEAVE.  (#161604)
+       
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): 
+       (list_select_func): Don't call gtk_file_info_get_is_folder()
+       on NULL. 
+
        * gtk/gtkaboutdialog.c (gtk_about_dialog_get_logo_icon_name): 
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 652eb7e057dbb3565a2b39a632e5281be53cdd21..0cce19d02af23d3ea4fc996728748d4b5c1fb910 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,16 @@
 2004-12-18  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkfilechooserentry.c (check_completion_callback) 
+       (load_directory_callback): Add missing GDK_THREADS_ENTER/LEAVE.
+
+       * gtk/gtkfilechooserdefault.c (edited_idle_cb) 
+       (shortcuts_drag_outside_idle_cb): Add missing 
+       GDK_THREADS_ENTER/LEAVE.  (#161604)
+       
+       * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): 
+       (list_select_func): Don't call gtk_file_info_get_is_folder()
+       on NULL. 
+
        * gtk/gtkaboutdialog.c (gtk_about_dialog_get_logo_icon_name): 
        (gtk_about_dialog_init): Add missing initializations.  (#161646,
        Torsten Schoenfeld)

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 146f758381671ca85aac9c072d37765e909e39d3..3f39bacfe1f49e164167fdfeb54ecc0c0e1d83bd 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1617,6 +1617,8 @@ new_folder_button_clicked (GtkButton             *button,
 static gboolean
 edited_idle_cb (GtkFileChooserDefault *impl)
 {
+  GDK_THREADS_ENTER ();
+  
   g_source_destroy (impl->edited_idle);
   impl->edited_idle = NULL;
 
@@ -1652,6 +1654,8 @@ edited_idle_cb (GtkFileChooserDefault *impl)
       impl->edited_new_text = NULL;
     }
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
@@ -1977,7 +1981,7 @@ selection_check_foreach_cb (GtkTreeModel *model,
   gtk_tree_model_sort_convert_iter_to_child_iter (closure->impl->sort_model, &child_iter, iter);
 
   info = _gtk_file_system_model_get_info (closure->impl->browse_files_model, &child_iter);
-  is_folder = gtk_file_info_get_is_folder (info);
+  is_folder = info ? gtk_file_info_get_is_folder (info) : FALSE;
 
   closure->all_folders = closure->all_folders && is_folder;
   closure->all_files = closure->all_files && !is_folder;
@@ -2367,10 +2371,15 @@ shortcuts_drag_set_delete_cursor (GtkFileChooserDefault *impl,
 static gboolean
 shortcuts_drag_outside_idle_cb (GtkFileChooserDefault *impl)
 {
+  GDK_THREADS_ENTER ();
+  
   shortcuts_drag_set_delete_cursor (impl, TRUE);
   impl->shortcuts_drag_outside = TRUE;
 
   shortcuts_cancel_drag_outside_idle (impl);
+
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 #endif
@@ -4232,6 +4241,8 @@ load_timeout_cb (gpointer data)
 {
   GtkFileChooserDefault *impl;
 
+  GDK_THREADS_ENTER ();
+
   impl = GTK_FILE_CHOOSER_DEFAULT (data);
   g_assert (impl->load_state == LOAD_LOADING);
   g_assert (impl->load_timeout_id != 0);
@@ -4242,6 +4253,8 @@ load_timeout_cb (gpointer data)
 
   load_set_model (impl);
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
@@ -5584,7 +5597,7 @@ list_select_func  (GtkTreeSelection  *selection,
 
       info = _gtk_file_system_model_get_info (impl->browse_files_model, &child_iter);
 
-      if (!gtk_file_info_get_is_folder (info))
+      if (info && !gtk_file_info_get_is_folder (info))
        return FALSE;
     }
     

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index 1f28eda929c8743fbdcc96cf99058a79c1e2ff53..66bc6b566e15c607674fd2f66f3394ee8e92fa21 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -391,15 +391,17 @@ check_completion_callback (GtkFileChooserEntry *chooser_entry)
   GtkFilePath *unique_path = NULL;
   gboolean valid;
 
+  GDK_THREADS_ENTER ();
+
   g_assert (chooser_entry->file_part);
 
   chooser_entry->check_completion_idle = NULL;
 
   if (strcmp (chooser_entry->file_part, "") == 0)
-    return FALSE;
+    goto done;
 
   if (chooser_entry->completion_store == NULL)
-    return FALSE;
+    goto done;
 
   valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (chooser_entry->completion_store),
                                         &iter);
@@ -497,6 +499,10 @@ check_completion_callback (GtkFileChooserEntry *chooser_entry)
       g_free (common_prefix);
     }
 
+ done:
+
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }
 
@@ -578,17 +584,19 @@ load_directory_callback (GtkFileChooserEntry *chooser_entry)
 {
   GSList *child_paths = NULL;
 
+  GDK_THREADS_ENTER ();
+
   chooser_entry->load_directory_idle = NULL;
 
   /* guard against bogus settings*/
   if (chooser_entry->current_folder_path == NULL ||
       chooser_entry->file_system == NULL)
-    return FALSE;
+    goto done;
 
   if (chooser_entry->current_folder != NULL)
     {
       g_warning ("idle activate multiple times without clearing the folder object first.");
-      return FALSE;
+      goto done;
     }
   g_assert (chooser_entry->completion_store == NULL);
 
@@ -600,7 +608,7 @@ load_directory_callback (GtkFileChooserEntry *chooser_entry)
 
   /* There is no folder by that name */
   if (!chooser_entry->current_folder)
-    return FALSE;
+    goto done;
   g_signal_connect (chooser_entry->current_folder, "files-added",
                    G_CALLBACK (files_added_cb), chooser_entry);
   g_signal_connect (chooser_entry->current_folder, "files-removed",
@@ -625,6 +633,11 @@ load_directory_callback (GtkFileChooserEntry *chooser_entry)
 
   gtk_entry_completion_set_model (gtk_entry_get_completion (GTK_ENTRY (chooser_entry)),
                                  GTK_TREE_MODEL (chooser_entry->completion_store));
+
+ done:
+  
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }